Merge bugfixes from CEDET upstream.
authorDavid Engster <dengste@eml.cc>
Mon, 13 Jan 2014 20:09:40 +0000 (21:09 +0100)
committerDavid Engster <dengste@eml.cc>
Mon, 13 Jan 2014 20:09:40 +0000 (21:09 +0100)

Trivial merge